Merge "Add a lock when unwrapping lazy value in bundles"