Merge "Fixing content intent on External Storage notification" into oc-dev