Merge "Use theme corner radius in volume and power dialog"