Merge "SF: tune infrequent layers for animations"