Merge "Fix ContentResolver opening with O_DIRECT" into rvc-dev