Merge "Include containing window title in SurfaceView's title" into nyc-dev