Merge "Revert "Add findFocus API to support library again" again" into klp-dev