Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715
am: f5f982f014

* commit 'f5f982f0148f04f1bdf05312a9770f137e8dda54':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: If7fbf80682d5c7583f3cec37dd6e807a0067ac18