Merge "Fix bug where rounded corners were being set despite being disabled." into qt-dev