Merge "Revert "Offload role manager work to background thread"" into qt-dev am: b13d88af am: c75355ce am: 03edd1da Change-Id: I05e3c55b9475f18f84f31143904309e5f23af241