87788a49d7
This is most likely Compose issue so these changes will be reevaluated when new Compose ver is out. (cherry picked from commit 63048d2f0b57477aecb4fd91f1f8c20a66ec9e18)