Merge "Update ScreenRecoveryUI::Draw* function signatures."