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

Change-Id: I9060baf17df88095df52f6f06ff1c678eb314e1f