Merge "Fix concurrent display mode auto canceling"