Merge changes Ie9d7e9a3,I88d60484 into main

* changes:
  Migrate legacy framerate tests
  Fix framerate propagation from child to parent layers