Merge "Fixes null-ref when trying to start Guest session." into pi-dev