Merge "Don't override config of display contexts with activity display."