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