Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev