Merge "Fix Overview position in Drawer"