Merge "Revert "Fix longstanding 0B in heap tile"" into sc-dev