Merge "Adjust window rounded corners" into qt-r1-dev am: dcba632b41
am: 189c662b0e

Change-Id: Ic7e5ad474fcecb99c8b48c499e349bff3cd79c2d