Moving forward to the latest Tumbleweed the issue is still here. I was not easily able to fix it this time around and rolled back to my previous working snapshot. @Cliff Zhao do you have an update on the fix for the upgrade path with Plymouth?