Merge "Device State Manager drives LogicalDisplayMapper"