Merge "Revert "Offload role manager work to background thread"" into qt-dev am: b13d88af52
am: 7a849b0412

Change-Id: Ia9af186f490335b4ed48987e709f67cd9a61be9a