Merge "Ensure the sandbox is cached when the app is" into main