Merge "Crash upon scrolling to the footer view with keyboard"