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

Change-Id: Idb27cb8e19376e11f7ec2e9366c50c8d382cf8ba