diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 83cd8e6bc8..bbd1d9e42c 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -162,6 +162,9 @@ void Framework::Resize(int w, int h)
 {
   m_contextFactory->CastFactory<AndroidOGLContextFactory>()->UpdateSurfaceSize();
   m_work.OnSize(w, h);
+
+  //TODO: remove after correct visible rect calculation.
+  frm()->SetVisibleViewport(m2::RectD(0, 0, w, h));
 }
 
 void Framework::DetachSurface(bool destroyContext)
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index fbabf108f9..4a113c0bbc 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -419,13 +419,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
     processIntent(getIntent());
     SharingHelper.prepare();
 
-    mVisibleRectMeasurer = new VisibleRectMeasurer(new VisibleRectListener() {
-      @Override
-      public void onVisibleRectChanged(Rect rect) {
-        Framework.nativeSetVisibleRect(rect.left, rect.top, rect.right, rect.bottom);
-      }
-    });
-    getWindow().getDecorView().addOnLayoutChangeListener(mVisibleRectMeasurer);
+    //TODO: uncomment after correct visible rect calculation.
+    //mVisibleRectMeasurer = new VisibleRectMeasurer(new VisibleRectListener() {
+    //  @Override
+    //  public void onVisibleRectChanged(Rect rect) {
+    //    Framework.nativeSetVisibleRect(rect.left, rect.top, rect.right, rect.bottom);
+    //  }
+    //});
+    //getWindow().getDecorView().addOnLayoutChangeListener(mVisibleRectMeasurer);
   }
 
   private void initViews()
@@ -1158,7 +1159,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @Override
   public void onPreviewVisibilityChanged(boolean isVisible)
   {
-    mVisibleRectMeasurer.setPreviewVisible(isVisible);
+    if (mVisibleRectMeasurer != null)
+      mVisibleRectMeasurer.setPreviewVisible(isVisible);
 
     if (isVisible)
     {
@@ -1183,7 +1185,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @Override
   public void onPlacePageVisibilityChanged(boolean isVisible)
   {
-    mVisibleRectMeasurer.setPlacePageVisible(isVisible);
+    if (mVisibleRectMeasurer != null)
+      mVisibleRectMeasurer.setPlacePageVisible(isVisible);
 
     Statistics.INSTANCE.trackEvent(isVisible ? Statistics.EventName.PP_OPEN
                                              : Statistics.EventName.PP_CLOSE);