Merge "Preventing a shortcut which requires permissions from being added to homescreen" into ub-launcher3-calgary-polish