Merge "Fix two bugs in installer session error display"