Merge "Revert "Dispatch global settings changes to all users."" into pi-dev