Merge "Fix UMO missing on lock screen when starting from hub" into main