Merge "Fix ShortcutService handling of locale change during device setup."