Merge with https://github.com/openwebos/build-desktop/commit/202950a0060c0bec8c3ad06102a47d4de0f77471