Merge "Display service needs trigger to start" into main