Merge "DMS: use vsync rate when calculating the app frame rate" into main