Merge changes from topic "am-4125e029-a507-49e6-9a52-cae6abb2d37d" into ub-launcher3-master

* changes:
  [automerger] Fixes an issue where on resetup of the FloatingHeaderView it defaulted to the main recyclerview even when the work recyclerview was active which resulted in the recyclerview not responding to scroll changes. am: 1a637bee
  Fixes an issue where on resetup of the FloatingHeaderView it defaulted to the main recyclerview even when the work recyclerview was active which resulted in the recyclerview not responding to scroll changes.