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

Change-Id: I6f3120621d06cabf123ec5052cb7ace0f6cb6dde