Merge "Moved window focus calculation to DisplayContent"