Merge "recovery: Add ability to set title lines" am: cba047f944 am: 6283f64568
am: ebc910901c

Change-Id: I51055a2ae70534c0107e6001d6db0e31f2a2932d