Cherry picked for rounded buttons