Merge "Make FLAG_KEEP_SCREEN_ON use per-display wakelocks" into tm-qpr-dev