Merge "Making some shortcut manager calls protected by MR1 version check" into ub-launcher3-calgary