Merge "Add class PromptContentViewWithMoreOptionsButton" into main