Merge "Merge "Do not tell app the user is leaving" into sc-dev am: 0c13593a am: 155861c9" into sc-v2-dev-plus-aosp