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

Change-Id: I9d87436cb157322f1fa02cdb00d6f4071ca0fae9