Merge "Show keypad while setting PIN in setup wizard" into oc-dr1-dev