Merge \"Making some shortcut manager calls protected by MR1 version check\" into ub-launcher3-calgary
am: 0d21daace2

Change-Id: I4f109621ca2ebae03079bfd4fba57cc4f4a332bc