Merge "Issue 28264: Handle adding annotations from markers outside of class"