Merge "Update null cipher notification mutator to remain consistent with API" into main