Merge "DO NOT MERGE Consider current scroll position to move text field into view." into jb-dev