Merge "Validate cached allowed state when MCC change." into main