Only stable branch need custom patch, main is fixed by upstream Signed-off-by: Peter Bee <bijunda1@xiaomi.com>