Merge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8
am: 94ed3c84d6

Change-Id: Ifa806aa752d7c40f4fae42d57d944a7fd1353d74