Merge with https://github.com/openwebos/build-desktop/commit/6851baca1941b6ccce1f0cf066cb475d743ed597