Merge "SF: Cleanup creating / destroying virtual display APIs" into main