Merge "keyguard: fix-fix layout for sw320dp devices" into cm-11.0
(cherry picked from commit 7adda8f33b919077392c7ad864a6d666edcab574)
PhoneWindowManager: fix navbar behavior in expanded mode after 4.4.2 merge.

Change-Id: I00f814db6c3800b8eb1cf20004ecdfb8d1ee7036
(cherry picked from commit e18e0f1dad3b244624d15276cc0a21f14dd05158)
Fix indention.

Change-Id: Ibbac20f4b8d14aaf753c463293bc4caa6c64cb91
(cherry picked from commit 51ab82a180d8e0f4d521d80c57ed5ab3c6a5bd0b)

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