Merge "Fix bug where rounded corners were being set despite being disabled."...
Merge "Fix bug where rounded corners were being set despite being disabled." into qt-dev am: 95bc50fa am: 7ccf4a70
am: de9ca400
Change-Id: Ifd8aa55513dea180f9b0438ed2126403b3d00c18