Merge "Use system dialog corner radius"