Merge "Fix projection offset caching"