chore(web): Merge branch 'fix/common/models/templates/6572-contraction-detokenization' into fix/web/subkey-fat-fingering
