Merge "Handle destroyed sessions and fix color issues"