Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev am: 16edc46ca3
am: 4633240f64

Change-Id: Icb14812f21c3d24dc728f2f2d47e98b917bf8b70