Merge "Fix Lost RAM calculation by accounting for ION mapped heaps" into rvc-dev