Merge "ACodec: defer setSurface at OutputPortSettingsChangedState"