Merge "Provide more feedback to Settings when sessions fail"