Merge "Address APP_STREAMING dialog feedback." into main