Merge "Fix flicker when device is unlocked from AOD." into sc-dev