Merge "Revert "Offload role manager work to background thread"" into qt-dev