Merge "Fixing broken clear focus behavior."