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

Change-Id: I76a743256fdd42a122922ec2f38afea4ce8da74f