Merge "Fix bug where rounded corners were being set despite being disabled." into qt-dev
am: 95bc50fafa

Change-Id: Id0d54ce7b849737af948c29297fbdda0a31ed30d