Merge "Match window rounded corners with system rounded corners." into udc-qpr-dev