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

Change-Id: I90aa430b7bcb5494804abc3960273c32b1c1bf81