Merge "Revert "Revert "Switch Framework resources to sparse encoding"""