Merge "[DO NOT MERGE] Lockscreen/Shade upscaling" into tm-dev