Merge "Remove CompatChange ID for ENABLE_PREVENT_INTENT_REDIRECT" into main