Merge "Fix AOD flicker during lockscreen transition" into udc-qpr-dev