Merge "Adjust window rounded corners" into qt-r1-dev