Merge "Show Battery saver tip when battery saver is on" into pi-dev