Merge "Fix battery saver slider is not displaying"