am 41d6bfb2: (-s ours) Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom

* commit '41d6bfb27909c2f27e41b5aa1d182e00b4c2f631':
  DO NOT MERGE Fix text selection drawing on SW