Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e
am: f1a371b1b0

Change-Id: I9de47dbda98fab48b82f99ebecee2d01f70526c5