Merge "Hide keyboard only when scrolling happens" into sc-dev