Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev