Merge "Use the resolved Context in ContentResolver."