Merge "Do not request focus during wake and unlock" into pi-dev
am: 58fc12e8fa

Change-Id: If45bd1074dc22c732074cfc59896614d4b28ab22