Merge "Listen to battery saver changes." into tm-dev