Merge "MediaRouter: Use background threads for disk operations" into mnc-ub-dev