Merge "Make sure PIN edit control is focused" into oc-dr1-dev
am: 61e61d96d1

Change-Id: Ib144b0ad110528d4d72fb15c5e463f0b24d5baed