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
* commit 'f5f982f0':
Fix wrong app is launched after solving challenge from tapping notification
Change-Id: If7fbf80682d5c7583f3cec37dd6e807a0067ac18