Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
am: 2dc9e9ad76
Change-Id: If6daebd9b285fe2a369009c3c68a31656085bff6
This commit is contained in: