Merge "Move activity to display on launch" into oc-dev
am: 5c5bf24033

Change-Id: I26c0eac1301e221fa5460b0291ea64c298da150d