Merge change from jb-dev to master

This is the change that fixes the random scrolling when switching
between reply/reply all

Merge of: https://android-git.corp.google.com/g/#/c/203483/1

Change-Id: I6b11016b4f48b297a2c6c40413cf6d6a52a193b4
1 file changed