More options to mix floating and nav bar height overlays (2/2)

Before slim buttons and floating were mutually exclusive, now they can
both be enabled as overlays so floating with a slim nav height can
occur.

Bug: 112934365
Test: manual
Change-Id: I34029973b968de725dc918f4ccfcdb12854bccd8