Merge "Update null cipher notification mutator API naming to match accessor" into main