Merge "Log Battery Saver states." into sc-dev