Fix multi-monitor issue

Change-Id: I660267e9a00634bc9ed61fd22c7925d7643dd8fe