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