Merge "recovery: Add ability to interrupt UI" am: 561ee9362c
am: 3528139409

Change-Id: If36991f0f57a358cfd1edce8c249fb22672733e1