Merge "Refactored text selection popup to reduce loc" into devel/master