Merge "Incorrect behavior of View clear focus."