am b27a4f9b: Merge "Remove custom scrollbar logic" into jb-dev

* commit 'b27a4f9b0e29d4fd4722c9152a39269aba527ef6':
  Remove custom scrollbar logic