Merge "Allow to finish session when all views are gone" into oc-dev
am: 3440e92009

Change-Id: I5adf95ccd456818f3858e7c2ee194d126be57f1f