Making some shortcut manager calls protected by MR1 version check

Change-Id: Ifdfa95a58aa18a825c1838c61055928dbe0ea3be
8 files changed