Merge "When undoing a removal, always return to the page it came from" into ub-launcher3-master