Merge "Use launch intent and disable TAPL"