Merge "Removing promiseIntent property from ShortuctInfo" into ub-launcher3-master