[Bug 226400] Merge Review: screen