Fixing the newIntent logic to check the state before it has been reset.
am: 85313735fa

Change-Id: I3a43a49c467a750adb031df4c3b880d453116739