Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev