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