Merge "Disable window corner rounding on some devices"