Merge "Do not request focus during wake and unlock" into pi-dev