diff --git a/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/Camera2Service.java b/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/Camera2Service.java
index 8997f02..7649009 100755
--- a/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/Camera2Service.java
+++ b/universal7885-common/apps/CameraLightSensor/src/com/eurekateam/cameralightsensor/Camera2Service.java
@@ -81,7 +81,7 @@ public class Camera2Service extends Service {
                         } catch (IllegalStateException e){
                             Log.w(TAG, "onReady: Session is NULL");
                         }
-                    },1500);
+                    }, 4000);
                 } catch (Exception e){
                     Log.e(TAG,  "Camera is in use");
                     e.printStackTrace();
diff --git a/universal7885-common/apps/SamsungParts/res/values/strings.xml b/universal7885-common/apps/SamsungParts/res/values/strings.xml
index 26a055d..4d8575b 100644
--- a/universal7885-common/apps/SamsungParts/res/values/strings.xml
+++ b/universal7885-common/apps/SamsungParts/res/values/strings.xml
@@ -68,7 +68,7 @@
     <string name="charge_summary">Enable/Disable Charging here.</string>
     <string name="fastcharge_title">Battery Info and Settings</string>
     <string name="fastcharge_summary">Enable/Disable Fastcharge Feature</string>
-    <string name="fastcharge_description">Manage FastCharge Feature here.</string>
+    <string name="fastcharge_description">Manage Charging Feature here.</string>
     <string name="battery_info_title">Battery Misc Info</string>
     <string name="battery_info_summary">Section for geeks</string>
 
diff --git a/universal7885-common/rro_overlays/TetheringOverlay/Android.bp b/universal7885-common/rro_overlays/TetheringOverlay/Android.bp
index 8a802ab..1def8b7 100644
--- a/universal7885-common/rro_overlays/TetheringOverlay/Android.bp
+++ b/universal7885-common/rro_overlays/TetheringOverlay/Android.bp
@@ -18,5 +18,5 @@ runtime_resource_overlay {
     name: "TetheringConfigOverlay",
     resource_dirs: ["res"],
     sdk_version: "current",
-    vendor: true
+    vendor: true,
 }
diff --git a/universal7885-common/sepolicy/vendor/genfs_contexts b/universal7885-common/sepolicy/vendor/genfs_contexts
index 6c19585..8eca321 100644
--- a/universal7885-common/sepolicy/vendor/genfs_contexts
+++ b/universal7885-common/sepolicy/vendor/genfs_contexts
@@ -116,6 +116,7 @@ genfscon sysfs /devices/platform/13870000.i2c/i2c-11/11-0048/input/            u
 genfscon sysfs /devices/platform/11ce0000.speedy/i2c-5/5-0003/input/input11		  u:object_r:sysfs_touchscreen_writable:s0
 # A20 Display
 genfscon sysfs /devices/platform/13870000.i2c/i2c-11/11-0020/input/            u:object_r:sysfs_touchscreen_writable:s0
+genfscon sysfs /devices/platform/11ce0000.speedy/i2c-6/6-0003/input/input12     u:object_r:sysfs_touchscreen_writable:s0
 
 genfscon sysfs /devices/platform/14870000.dsim/backlight/panel                    u:object_r:sysfs_graphics:s0
 genfscon sysfs /devices/platform/14a50000.abox/service                            u:object_r:sysfs_abox_writable:s0
@@ -157,7 +158,7 @@ genfscon sysfs /devices/platform/13840000.i2c/i2c-9/9-003d/s2mu106-powermeter/po
 genfscon sysfs /devices/platform/13840000.i2c/i2c-9/9-003d/s2mu106-muic/power_supply/muic-manager         u:object_r:sysfs_charger:s0
 genfscon sysfs /devices/platform/13840000.i2c/i2c-9/9-003d/s2mu106-charger/power_supply/otg               u:object_r:sysfs_charger:s0
 genfscon sysfs /devices/platform/13840000.i2c/i2c-9/9-003d/s2mu106-charger/power_supply/s2mu106-charger   u:object_r:sysfs_charger:s0
-genfscon sysfs /devices/platform/13830000.i2c/i2c-8/8-003b/power_supply/s2mu106-fuelgauge/                 u:object_r:sysfs_fuelgauge:s0
+genfscon sysfs /devices/platform/13830000.i2c/i2c-8/8-003b/power_supply/s2mu106-fuelgauge/type               u:object_r:sysfs_fuelgauge:s0
 
 genfscon sysfs /class/input/input1/enabled					     u:object_r:sysfs_sec_touchscreen:s0
 genfscon sysfs /module/modem_ctrl_ss310ap/parameters/ds_detect                    u:object_r:sysfs_modem:s0
diff --git a/universal7885-common/sepolicy/vendor/hal_audio_default.te b/universal7885-common/sepolicy/vendor/hal_audio_default.te
index 9eb9415..45dcc8f 100644
--- a/universal7885-common/sepolicy/vendor/hal_audio_default.te
+++ b/universal7885-common/sepolicy/vendor/hal_audio_default.te
@@ -12,3 +12,5 @@ allow hal_audio_default imei_efs_file:file r_file_perms;
 get_prop(hal_audio_default, vendor_radio_prop)
 
 allow hal_audio_default init:unix_stream_socket connectto;
+
+binder_call(hal_audio_default, system_suspend)
diff --git a/universal7885-common/sepolicy/vendor/hal_power_default.te b/universal7885-common/sepolicy/vendor/hal_power_default.te
index b1d0050..45e0e07 100644
--- a/universal7885-common/sepolicy/vendor/hal_power_default.te
+++ b/universal7885-common/sepolicy/vendor/hal_power_default.te
@@ -29,6 +29,7 @@ allow hal_power_default sysfs_input:file r_file_perms;
 allow hal_power_default sysfs_virtual:dir r_dir_perms;
 allow hal_power_default sysfs_virtual:file r_file_perms;
 allow hal_power_default sysfs_touchscreen_writable:dir r_dir_perms;
-allow hal_power_default sysfs_sec_touchscreen:dir read;
+allow hal_power_default sysfs_sec_touchscreen:dir { read open };
+allow hal_power_default sysfs_sec_touchscreen:file r_file_perms;
 type hal_lineage_power_hwservice, hwservice_manager_type; 
 add_hwservice(hal_power_default, hal_power_hwservice)
diff --git a/universal7885-common/sepolicy/vendor/hal_sensors_default.te b/universal7885-common/sepolicy/vendor/hal_sensors_default.te
index 2aedc5f..a9001dc 100644
--- a/universal7885-common/sepolicy/vendor/hal_sensors_default.te
+++ b/universal7885-common/sepolicy/vendor/hal_sensors_default.te
@@ -38,6 +38,7 @@ allow hal_sensors_default sysfs_lcd_writable:file r_file_perms;
 
 # /sys/class/input
 allow hal_sensors_default sysfs_input:dir r_dir_perms;
+allow hal_sensors_default sysfs_input:file write;
 
 # /sys/devices/virtual/input/input4
 # /sys/devices/virtual/input/input6
diff --git a/universal7885-common/sepolicy/vendor/mediacodec.te b/universal7885-common/sepolicy/vendor/mediacodec.te
index 9bd5632..c6702fd 100644
--- a/universal7885-common/sepolicy/vendor/mediacodec.te
+++ b/universal7885-common/sepolicy/vendor/mediacodec.te
@@ -4,3 +4,4 @@ allow mediacodec sysfs_v4l_mfc:dir search;
 allow mediacodec sysfs_v4l_mfc:file r_file_perms;
 
 hal_client_domain(mediacodec, hal_power)
+hal_client_domain(mediacodec, hal_omx)
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index c6885a2..4417be8 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -161,7 +161,7 @@ PRODUCT_COPY_FILES += \
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
+# DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
 
 # Permissions
 PRODUCT_COPY_FILES += \