Merge "Fix UDFPS unlock while waking with occlusion" into tm-dev