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

Change-Id: I140700571960df4c57d5d4dcc436c9527a4ba66b