Fixed proper drawer/action bar interaction