am 37f29abe: Merge "DO NOT MERGE Consider current scroll position to move text...
am 37f29abe: Merge "DO NOT MERGE Consider current scroll position to move text field into view." into jb-dev
* commit '37f29abe':
DO NOT MERGE Consider current scroll position to move text field into view.