Merge "Avoid MTP open binder call to MediaProvider" into sc-dev