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

Change-Id: I827dd3b99e3d7a24a5c9b885615738d045016d94