Merge changes Idd883e15,I9e13e04f

* changes:
  Re-enable default display when switching to VR mode.
  Add LambdaMessage to SurfaceFlinger