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

Change-Id: I4129187f5ac00a08f5b0bb6fdf62a9703c861bd9