o.c.sds.ui: Fix wrong layer IDs and switch the ordering of the layers
Merge remote-tracking branch 'Desy-extern/rel15x' into rel15x