Merge changes from topic 'virtual-display-api' into oc-dev am: 13ba34bf37
am: 875c8445a8

Change-Id: I12f88b60d82fba4227c9f565009e6c3e42f6798c