Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom