Merge "Add OPTION_DIVIDER_PADDING property to TextSelectionPopup" into devel/master