Merge "Allow mediaprovider to search /mnt/media_rw" into pi-dev