Merge "Removing items which are on invalid screen" into ub-launcher3-burnaby