Merge "Don't let apps enable compat changes past the SDK" into main