Merge "Adds sanity checks to session commit and abandon" into qt-dev