Fix SystemUI FC / Some moar changes

Change-Id: Ibb92b948b6d572025a2377eadb603b80a0f750fe

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java