Merge "Set intent flags for notifying messaging app." into oc-mr1-dev