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: b6ce5eb1
am: e51220cd
Change-Id: I4eddd506b463a11aaafb8147158b3842952aaff3