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

* commit 'c3bd9dc93fa27b7fe96ed1870fa05074c9438266':

Change-Id: Ib2ec0d403ccac5ed35f08c559217ddda2684b3b4