Merge "Workaround to display menus for AppCompat themes" into nyc-dev