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