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

Change-Id: Ifc3714cf81596fb3e909139e1bae05b02b507000