Merge changes I2e0a0d49,Iccbe9cc4 into main

* changes:
  Fix FrameRateCategory::NoPreference in SF
  Add perfetto trace for layer vote