Fix: wallpaper changes when changing lockscreen WP

Since LockscreenWallpaperPickerActivity did not override
cropImageAndSetWallpaper the homescreen wallpaper was changing
when selecting the default_wallpaper resource.

Change-Id: I26dd28e628a3ef701ad92a81aa80327d3ccba092
Fix side button visibility tracking.

Previously one could e.g. get legacy menu button being visible in
certain scenarios, like this one:
- Open legacy app, e.g. CatLog
- Invoke IME
- Lock screen
- Unlock screen
- Result: Menu button visible in keyguard

Change-Id: Ia796f73ec995ea1cc34d38f8aefdbccda7be7565
Merge branch 'cm-11.0' into kk_mkt