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

Change-Id: I5a52771d7d886f568d63601b22722b4976efee46