Merge "SF: Remove DisplayDevice visible layer members"