Before: <img width="162" alt="Screenshot 2024-04-05 at 02 25 27" src="9f786811-3e45-4b3c-aaf9-e1d2cad284d2"> After: <img width="172" alt="Screenshot 2024-04-05 at 02 27 25" src="f5254877-9e0d-44cb-9605-ba15c75872bb"> (cherry picked from commit 556099fa72f6239aa9446d06265876bc72b021b8)
9f786811
f5254877