Merge "Remove unnecessary requestFocus" into nyc-mr1-dev