Sync from master

Fixed text selection styles