Second attempt to fix the Android Orientation and Graph Redraw bug