Merge "Enable starting window logging" into oc-dev