Merge "Fix invalid launch state reported to "am start -W""