Merge "Unmap shared memory when no longer used" into pi-dev