Merge "Handle unknown credential type in RemoteViewFactory" into main