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

Change-Id: I4a82042c9bdd0419e5b3cfb9d1c4e08545bc025d