Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev