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

Change-Id: I5e1e9e98a029991287eeee595aa4e9cbe99ed753