Merge "Fix wrong app is launched after solving challenge from tapping...

Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee7 am: f5f982f0
am: b9362cf6

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

Change-Id: I1ae8d5399470e449947d3ecf57285d39145d0a1e