Ensure focus is set to input control when clicked in people picker control
Merge branch 'master' into dev-bert