Merge "Ensure obb migration finish before mounting obb for app data isolation"