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

Change-Id: I796540431ab767880929b2c3fd1dd08022f28ed3