Merge "Close the Drawer on BACK button if the Drawer is opened"