Merge "Add closeAllApps scenario and refactor" into main