Merge "Remove the need for using a OnFocusChangeListener" into lmp-mr1-ub-dev