am: c9289b8053
* commit 'c9289b805307ff071ad2b17936bfb4b4a6f4ad84':
Refactoring ShortcutManager + bug fixes.
Change-Id: I9b584cd3ff0125294556fc3ca56cc01895167367
am: c9289b8053
* commit 'c9289b805307ff071ad2b17936bfb4b4a6f4ad84':
Refactoring ShortcutManager + bug fixes.
Change-Id: I9b584cd3ff0125294556fc3ca56cc01895167367