Merge "Fix race condition when entering low persistence mode" into oc-mr1-dev