Merge "Associate SystemUiContext with DisplayContent"