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

Change-Id: Ieb2b576e5178a2885c5c1df0eba41c2c4f6d50ae