Merge "add recovery UI customizations for stingray"