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