Merge "Use the right flag for credential view APIs" into main