Merge "SF: Manage many-to-one DisplayDevice to layerStack mapping for input"