Merge "Enforce the PI mutability flag requirement for test apps" into sc-dev