Merge "Extend lifetime of notifs during activity launch" into tm-dev