Merge "Some work on issue #3201795: Improve transition when keyboard comes up"