Merge "Fix ActivityNotFound Exception in Dev Tools"