Merge "Cancelling launcher reload on mcc change" into ub-launcher3-burnaby