Improve MtpStorage handling when more than one storage is present

Change-Id: I02f1984d02a85d9fd42450cc3772e88a43d9e9ff