Merge "Remove the battery optimization menu"