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

Change-Id: I0a5900cba2e650082e9d9443c111f1682bb393e8