Merge "b/7363553: fix keyboard interaction when re-entering Compose Message activity." into jb-mr1-dev