Merge "Setup flags for clearing credMan session" into main