Merge "Skip close activity transition since no closing app can be visible" into sc-dev