Merge "Revert "Always apply compat changes to system apps.""