Merge "Allow to finish session when all views are gone" into oc-dev