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

Change-Id: I5a985cea550d81f944f3f690b036cf68d37e10c5