Merge "Fix ephemeral intent caching in notification" into oc-dev