Merge "Use last reported configuration for apps that are going-away" into sc-dev