Revise custom modifier implementation

[ryanw-mobile]

https://developer.android.com/jetpack/compose/custom-modifiers#compositionlocal_values_are_resolved_at_the_call_site_of_the_modifier_factory

The recommended way to define a custom modifier have changed. Let's take a look at that and see if we have to update the implementation.