Merge "MTP: Add support for dynamically adding and removing storage units"