Merge "Add cycle-clean option in AppLaunch" into pi-dev