Merge pull request #312494 from OPNA2608/fix/plymouth-matrix-theme_fixups