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
am: 723eff55
Change-Id: I76a743256fdd42a122922ec2f38afea4ce8da74f