Merge "Introduce flag for app restrictions API" into main