Merge "Don't initialize the hw renderer without a valid surface. Bug #3054952"