Merge "SF: Restructure OutputLayer creation to remove displayId argument"