Merge "Fixed drawer menu click listener behaviour" into nyc-dev