Merge "Fix Drawer selection when using BACK"