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

Change-Id: Iae0fabc3d580f77799c61966d4e2f48bda5d4bd2