Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev