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

Change-Id: I664046e043150acbea9615a208a3d185f67d039f