Merge "Special handling for intent coming from "welcome" notification." into tm-dev