Merge "Add the settings content observer for shortcut preference." into rvc-dev