Merge "Make the positive dialog button use accent color"