Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev