Yes, your solution is correct! I discovered this issue too late for launch, but I have a PR open with this.

It needs some extensive testing because there might be weird interactions with our layout component and all the different header modes it has (scrolling header, waterfall, etc). Working on it :)

edit: https://github.com/google/material-design-lite/pull/730