More options to mix floating and nav bar height overlays (1/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: Ic6b3e1216e5395e71c72391f893182e263188572