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

Change-Id: Ia00ea7d1298a6f46c1ff779f13a3bf015ec5cd8a