Merge "Changing media dest from mnt/sdcard to /sdcard" into mnc-dev