Merge "configs: trinket: Config changes on trinket"