Merge "Merge "Fix NPE with live wallpaper" into qt-dev am: c9fa07161a am: a55ddc8084" into qt-r1-dev-plus-aosp