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