Merge "Add systrace tag for thermal"