Merge "Add new "options" argument to all startActivity APIs."