Merge "Improve output of multiple screen resolution"