Lower z-index so it can work with expandables
(cherry picked from commit 8ea9966)