Merge "Fix issue where pin field doesn't have focus (issue 7348937)" into jb-mr1-dev