Merge "Add enum for conversation screen"