Merge "Don't access disk on main thread"