Merge "Fix flattenLayers_ActiveLayersWithLowFpsAreFlattened" into main