Merge "Don't modify invariant device profile" into main