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

Change-Id: I51071b091a91168dd05c2c4b33aa1b42c5769f97