Merge "Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev am: 71682ae9c7 am: 9760cd265e" into qt-r1-dev-plus-aosp