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