Merge "Add MtpStorageManager for monitoring filesystem events"