Merge "Do not tell app the user is leaving" into sc-dev