Merge "Bug fix flag to show different error screen for PS creation" into main