Merge "TextSelection Popup Styling Image update and json" into devel/master