Merge "Disable battery saver notification based on predicted time left" into tm-dev