Merge "Catch exception when ViewRoot's surface is not valid. Bug #3399426" into honeycomb