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

Change-Id: Id940acc4ae33dd66eabed0d4ea06d7de89643bd2