Merge "Change POINTER_ICON_STYLE enum to a type safe enum class"