Merge "Fix LogicalDisplayMapper Log line to just log device state identifier" into main