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

Change-Id: Ic98c407acb2d0816ea18e2930e137eaa32d6a1e6