Merge "Fixing the newIntent logic to check the state before it has been reset." into ub-launcher3-calgary-polish