Merge "Refactor the user restrictions listener to use a set of changes to user restrictions."