Merge "Don't show starting window for overlay activities" into oc-dev