Merge "Fix flag namespace for AppProfiler PSS flag" into main