Merge "Revert "Incorrect behavior of View clear focus.""