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

Change-Id: I95d0ff8a4902efcce579ccc20dbfd2a2aa6721ef