Merge "Revert "Offload role manager work to background thread"" into qt-dev am: b13d88af am: 7a849b04 am: d8f3bc4d Change-Id: I6a403a7676b99c231bedc09147b3ebff85826af3