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

Change-Id: I3492687fc075e182ad4032452b779b677992c808