Merge "Wait for device profile reload" into main