AppPicker: cleanup fix: Intent tag might not always be at the beginning