Merge "Fix inner/outer circle swap and dot color in RadialTimePickerView"