Merge "Remove ContentResolver binder call from UI thread" into udc-qpr-dev