Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev