Merge "Fix inconsistent info in display frames"