Merge "Restrict sending new intent to one invocation." into oc-mr1-dev