Merge "Fix wallpaper flicker issue while transiting from home to aod." into qt-dev am: 71682ae9c7
am: 49f5870f0c

Change-Id: Ib33b5da253df0e2aa7c27d71486629101c334546