Merge "Use custom drawable for Battery saver condition icon." into pi-dev