Merge "Fix focus highlight bug"