Merge "Fix AlertDialog corner and color accent"