Merge "Refactor REFS_PER_FRAME definition"