Merge "Remove enforceFrameCount"