diff --git a/.gitignore b/.gitignore
index f551ba225b..b16e47f85f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ db_files
 .project
 .classpath
 .project.properties
-gen/
+**/gen
 tests/stress/gen/
 WallpaperPicker/gen/
 WallpaperPicker/.project.properties
@@ -11,7 +11,7 @@ bin/
 .idea/
 .gradle/
 local.properties
-build/
+**/build/**
 .DS_Store
 keystore.properties
 *.jks
diff --git a/platform_frameworks_libs_systemui b/platform_frameworks_libs_systemui
index 8a7db120c5..83e2a396c1 160000
--- a/platform_frameworks_libs_systemui
+++ b/platform_frameworks_libs_systemui
@@ -1 +1 @@
-Subproject commit 8a7db120c569258013b8a110b95a0e1bb79d176f
+Subproject commit 83e2a396c12e68e6d7a196b69e635aab26e86095