Merge "Revert "Separate scroll and swipe views in SwipeRefreshLayout"" into klp-ub-dev