Merge "Show empty options in shortcut chooser dialog if shortPreference is unchecked." into rvc-dev am: 68084f39d0
am: 2e36e9ba67
am: eaf2e1c860
am: 50a8548fef
Change-Id: Iafdf4d6c2a289e26f6f8e8fcae7dd241f524c756
This commit is contained in: