Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518 am: 814468deb5
am: 00c9829f4a

Change-Id: I7e5c4e93c01919913efc9d73608c5a4df703163f