Merge "[DO NOT MERGE] OCCLUDED->LOCKSCREEN transition" into tm-qpr-dev