Merge "Incorrect behavior of View clear focus v2.0."