Merge "Fix volume naming when surfaced over MTP." into mnc-dev