Merge "SF: Fix for a leaked mock reported in processesVirtualDisplayAdded"