Merge "Move activity to display on launch" into oc-dev