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

* commit '3cff77b88ef9a9dc4259f1085dafa68b8a58376f':

Change-Id: I6c2fe404bf522e643fcb58ba58f882c74a0ac904