Merge "RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request"