Merge "Prevents drawer menu from showing depending on intent." into nyc-dev