Merge "Remove Handler for Syncing Config Changes"