[OE-3379] update + create on switch firm flow fix
Merge branch 'release/1.4' of https://github.com/openeyes/OpenEyes into release/1.4