Merge "Look on all displays if can't launch on a source secondary one" into oc-dev
am: d883070267

Change-Id: I92bd1ad211fb97bf27fe34a8d1fe4c57c6c46d89