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

Change-Id: Id73291474dc25682e98d185c4ef574f964027fed