Merge "Skip updating DisplayFrames when everything is the same" into tm-dev