Hybrid 2.0

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

Change-Id: I5a7efccefd681ffdf0457c8ca87826a5767587df
Merge remote-tracking branch 'pa/hybrid2' into fjpa

Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/HybridTile.java