Merge "Apply rounded corners to startWindow" into tm-qpr-dev