Merge "Fix startActivityAndWait bugs"