Merge "Remove EditStyledText from the framekwork"