Merge "Add Compat framework flag to restrict SAF" into rvc-dev