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

Change-Id: Ia090e4660c4e36de24f1fb3653743b1ad31fe093