Merge "Add controllers for default app shortcut preferences."