Merge "Always redraw the UI on orientation change Bug #4994715"