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

Change-Id: Ifd8aa55513dea180f9b0438ed2126403b3d00c18