Merge "change tab focus highlight"