Fix intent handling

 Bug: 5405096
 If state != null, don't process the intent in getIntent, it will be
 stale

Change-Id: Icc854a1d8f11fdbd60c1f7f854053f2294864b0f
2 files changed