Small step towards supporting multiple displays

Change-Id: I353449c2b464394988c7e0203656b5851a0c9127
17 files changed