Merge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8 am: f0d3971021
am: 2d41b97bc3

Change-Id: I4de4d39d14746691ca74e13918f3ae06476b91bc