FP2-1242 Progress bar artifacts while updating device

Change-Id: I2350492afb8ab4abd6447bf7c6f52995c8640437
diff --git a/minui/graphics.c b/minui/graphics.c
index 51aaf24..67248d3 100644
--- a/minui/graphics.c
+++ b/minui/graphics.c
@@ -280,7 +280,7 @@
     unsigned char* src_p = source->data + sy*source->row_bytes + sx*source->pixel_bytes;
     unsigned char* dst_p = gr_draw->data + dy*gr_draw->row_bytes + dx*gr_draw->pixel_bytes;
 
-    icon_blend_alpha(src_p,source->row_bytes,dst_p,gr_draw->row_bytes,source->width,source->height);
+    icon_blend_alpha(src_p,source->row_bytes,dst_p,gr_draw->row_bytes,w,h);
 }
 
 unsigned int gr_get_width(GRSurface* surface) {
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 03ef049..66dc050 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -206,12 +206,11 @@
 // Should only be called with updateMutex locked.
 void ScreenRecoveryUI::draw_screen_locked()
 {
-    if (!show_text) {
-        draw_background_locked(currentIcon);
-        draw_progress_locked();
-    } else {
+    draw_background_locked(currentIcon);
+    draw_progress_locked();
+
+    if (show_text) {
         gr_color(0, 0, 0, 255);
-        gr_clear();
 
         int y = 0;
         int i = 0;