Merge "Flicker free screen-on from AOD" into oc-dr1-dev