Merge "`OnScroll` roundness type should be reset to 0f when the View is removed from the Shelf" into tm-qpr-dev