Merge "Fix selection highlights."