Merge "Expand notif activity starter lifetime extension" into tm-dev