Merge "Preventing NullPointerException when cancelling a shortcut addition" into ub-launcher3-burnaby