Merge "DO NOT MERGE Perform disk operations in background thread" into cw-e-dev