Merge "Fix a flicker when returning to the lockscreen" into nyc-mr1-dev