Merge "Do not show the notification prompt on noDisplay activities" into tm-dev