Merge "Fix # of arguments to startActivity"