Merge "Clear calling id before updating MediaStore." into oc-dr1-dev