Merge "Calling setIsDrawerPresent(false) twice causes a crash." into nyc-dev