Merge "Fix wrong wallpaper AoD state"