Merge "Expanded wallpaper APIs for keyguard and change detection"