Fix dark mode on the new Drawer

Change-Id: I9efb2402ae02de00c0a38065a59271e0fd1b2e16