Merge changes from topic "legacycodez"

* changes:
  Progress towards splitting MediaProvider UID.
  Progress towards splitting MediaProvider UID.