Merge "Remove legacy frames from WindowFrames and DisplayFrames"