Squash of LockscreenWallpaper fixes
Merge branch 'kitkat' of https://github.com/GzRoms-Redux/android_frameworks_base into kitkat