Merge "SF: layers above the frameRateMultipleThreshold should always be counted"