Merge "Modify the privacy controller to be selectable in the next updateState()"