The previous change was done to solve a case of duplicated xmlids in
v12. By some confusion, both xmlids were changed in separated
commits. This new commit returns the original xmlid of one and assures
to avoid more confusions by adding 'settings' to the other.

Closes odoo/odoo#36885

closes odoo/odoo#37755

Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>