Merge "Remve menu item in battery settings"