am 2a8edbe9: Merge "Revert "Separate scroll and swipe views in SwipeRefreshLayout"" into klp-ub-dev

* commit '2a8edbe937d2435501228596f87bfda3e88d1a0b':
  Revert "Separate scroll and swipe views in SwipeRefreshLayout"