Merge "Split frame metrics functionality into a separate unit"