Merge branch 'Slim' into lp5.0

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java