Merge "Crash upon scrolling to the footer view with keyboard"
am: 9f57eda9ec

Change-Id: I142d2cb414102595b2bc8bbe7745a4704bd49027