Use the new shortcut manager APIs

Test: Manual tests
Change-Id: Ia521472f42cac7057afd42648339d3b0fb7d432a
10 files changed