Merge "Check if optional name fields are shown when expanding to full editor"