Merge "Override switch bar string for wifi/battery saver screen"