Merge "Add a placeholder to show the hint of text on dialog" into main