Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca
am: 8874d3c309

Change-Id: I678eb4f5e3ebee72f519bd0a9b3fd76cbcf18d7c