Merge "Added BACKGROUND_BORDER property to TextSelectionPopup" into devel/master