Merge "Set flags on the correct Intent, please" into oc-mr1-dev