Merge "Removing support for menu key from status bar"