Merge "recovery: c++ify pthread use in UI"
am: 85a007c47c

Change-Id: Ib060a22927dd7299d567d3961064119cac69bfef