Merge "Make PM unit tests work with trunk stable flags" into main