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

Change-Id: Ib1fd31f23546559a0cd1c45600a00d31a8ec2137