Merge "Remove temp workaround for PS feature flag" into main