Merge "Don't stop or restart hub timeout when dreaming state changes" into main