[openFATE 319416] Merge kernel-desktop back into kernel-default / kernel-pae