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

Change-Id: Icbd2513a96469ae187f2624a289982261478d475