Merge "Make sure PIN edit control is focused" into oc-dr1-dev