Merge "Generalize close app transition" into sc-dev