Merge "Bug 5936 - DeviceFlowRegistry flowId bug"