Merge "AOD: avoid flicker when turning off screen" into oc-dr1-dev