diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 5563e46a8b..0bdf3ac9b5 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -106,8 +106,6 @@ enum MultiTouchAction
 Framework::Framework()
   : m_lastCompass(0.0)
   , m_isSurfaceDestroyed(false)
-  , m_currentMode(location::PendingPosition)
-  , m_isCurrentModeInitialized(false)
   , m_isChoosePositionMode(false)
 {
   m_work.GetTrafficManager().SetStateListener(bind(&Framework::TrafficStateChanged, this, _1));
@@ -234,8 +232,6 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
     p.m_surfaceHeight = oglFactory->GetHeight();
   }
   p.m_visualScale = static_cast<float>(dp::VisualScale(densityDpi));
-  p.m_hasMyPositionState = m_isCurrentModeInitialized;
-  p.m_initialMyPositionState = m_currentMode;
   p.m_isChoosePositionMode = m_isChoosePositionMode;
   p.m_hints.m_isFirstLaunch = firstLaunch;
   p.m_hints.m_isLaunchByDeepLink = launchByDeepLink;
@@ -253,7 +249,7 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
   return true;
 }
 
-bool Framework::IsDrapeEngineCreated()
+bool Framework::IsDrapeEngineCreated() const
 {
   return m_work.IsDrapeEngineCreated();
 }
@@ -642,23 +638,12 @@ void Framework::SetMyPositionModeListener(location::TMyPositionModeChanged const
   m_myPositionModeSignal = fn;
 }
 
-location::EMyPositionMode Framework::GetMyPositionMode()
+location::EMyPositionMode Framework::GetMyPositionMode() const
 {
-  if (!m_isCurrentModeInitialized)
-  {
-    if (!settings::Get(settings::kLocationStateMode, m_currentMode))
-      m_currentMode = location::NotFollowNoPosition;
+  // No need in assertion here, return location::PendingPosition if no engine created.
+  //ASSERT(IsDrapeEngineCreated(), ());
 
-    m_isCurrentModeInitialized = true;
-  }
-
-  return m_currentMode;
-}
-
-void Framework::OnMyPositionModeChanged(location::EMyPositionMode mode)
-{
-  m_currentMode = mode;
-  m_isCurrentModeInitialized = true;
+  return m_work.GetMyPositionMode();
 }
 
 void Framework::SwitchMyPositionNextMode()
diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp
index ad693a0632..69974af199 100644
--- a/android/jni/com/mapswithme/maps/Framework.hpp
+++ b/android/jni/com/mapswithme/maps/Framework.hpp
@@ -70,8 +70,6 @@ namespace android
     void MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive);
 
     location::TMyPositionModeChanged m_myPositionModeSignal;
-    location::EMyPositionMode m_currentMode;
-    bool m_isCurrentModeInitialized;
 
     TrafficManager::TrafficStateChangedFn m_onTrafficStateChangedFn;
     TransitReadManager::TransitStateChangedFn m_onTransitStateChangedFn;
@@ -93,7 +91,7 @@ namespace android
 
     bool CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi, bool firstLaunch,
                            bool launchByDeepLink, uint32_t appVersionCode);
-    bool IsDrapeEngineCreated();
+    bool IsDrapeEngineCreated() const;
     bool DestroySurfaceOnDetach();
     void DetachSurface(bool destroySurface);
     bool AttachSurface(JNIEnv * env, jobject jSurface);
@@ -160,8 +158,7 @@ namespace android
 //    std::string GetOutdatedCountriesString();
 
     void SetMyPositionModeListener(location::TMyPositionModeChanged const & fn);
-    location::EMyPositionMode GetMyPositionMode();
-    void OnMyPositionModeChanged(location::EMyPositionMode mode);
+    location::EMyPositionMode GetMyPositionMode() const;
     void SwitchMyPositionNextMode();
 
     void SetTrafficStateListener(TrafficManager::TrafficStateChangedFn const & fn);
diff --git a/android/jni/com/mapswithme/maps/LocationState.cpp b/android/jni/com/mapswithme/maps/LocationState.cpp
index 4942acf310..7d8e4b851d 100644
--- a/android/jni/com/mapswithme/maps/LocationState.cpp
+++ b/android/jni/com/mapswithme/maps/LocationState.cpp
@@ -10,8 +10,6 @@ extern "C"
 static void LocationStateModeChanged(location::EMyPositionMode mode,
                                      std::shared_ptr<jobject> const & listener)
 {
-  g_framework->OnMyPositionModeChanged(mode);
-
   JNIEnv * env = jni::GetEnv();
   env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener.get(),
                       "onMyPositionModeChanged", "(I)V"), static_cast<jint>(mode));
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 4b376c1792..02f7eea910 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -124,7 +124,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
                NoConnectionListener,
                MapWidgetOffsetsProvider
 {
-  private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
+  private final Logger mLogger = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
   private static final String TAG = MwmActivity.class.getSimpleName();
 
   public static final String EXTRA_TASK = "map_task";
diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java
index ade44eb630..fde5b43104 100644
--- a/android/src/com/mapswithme/maps/location/LocationHelper.java
+++ b/android/src/com/mapswithme/maps/location/LocationHelper.java
@@ -154,12 +154,14 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
   };
 
   @SuppressWarnings("FieldCanBeLocal")
-  private final LocationState.LocationPendingTimeoutListener mLocationPendingTimeoutListener =
-      () -> {
-        stop();
-        if (PermissionsUtils.isLocationGranted(mContext) && LocationUtils.areLocationServicesTurnedOn(mContext))
-          notifyLocationNotFound();
-      };
+  private final LocationState.LocationPendingTimeoutListener mLocationPendingTimeoutListener = () -> {
+    if (mActive)
+    {
+      stop();
+      if (PermissionsUtils.isLocationGranted(mContext) && LocationUtils.areLocationServicesTurnedOn(mContext))
+        notifyLocationNotFound();
+    }
+  };
 
   @Override
   public void initialize(@NotNull Context context)
@@ -246,7 +248,7 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
         mReceiverRegistered = false;
       }
 
-      start();
+      initialStart();
     }
     else
     {
@@ -440,11 +442,16 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
    */
   public void restart()
   {
-    mLogger.i(TAG, "restart()");
     stop();
     start();
   }
 
+  private void initialStart()
+  {
+    if (LocationState.nativeGetMode() != LocationState.NOT_FOLLOW_NO_POSITION)
+      start();
+  }
+
   /**
    * Adds the {@link #mCoreLocationListener} to listen location updates and notify UI.
    * Notifies about {@link #ERROR_DENIED} if there are no enabled location providers.
@@ -455,7 +462,7 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
   {
     if (mActive)
     {
-      mLogger.i(TAG, "Provider '" + mLocationProvider + "' is already started");
+      mLogger.w(TAG, "Provider '" + mLocationProvider + "' is already started");
       return;
     }
 
@@ -492,7 +499,7 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
     mLogger.i(TAG, "stop()");
     if (!mActive)
     {
-      mLogger.i(TAG, "Provider '" + mLocationProvider + "' is already stopped");
+      mLogger.w(TAG, "Provider '" + mLocationProvider + "' is already stopped");
       return;
     }
 
@@ -553,7 +560,7 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
     }
     else
     {
-      restart();
+      initialStart();
     }
   }
 
@@ -597,9 +604,6 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
 
     mInFirstRun = false;
 
-    if (getMyPositionMode() != LocationState.NOT_FOLLOW_NO_POSITION)
-      throw new AssertionError("My position mode must be equal NOT_FOLLOW_NO_POSITION");
-
     // If there is a location we need just to pass it to the listeners, so that
     // my position state machine will be switched to the FOLLOW state.
     if (mSavedLocation != null)
@@ -610,12 +614,8 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
       return;
     }
 
-    // If the location hasn't been obtained yet we need to switch to the next mode and wait for locations.
-    // Otherwise, try to restart location updates polling.
-    if (mActive)
-      switchToNextMode();
-    else
-      restart();
+    // Restart location service to show alert dialog if any location error.
+    restart();
   }
 
   @Nullable
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index f792aa3d40..9d8c5691e9 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -1,7 +1,7 @@
 #include "drape_frontend/drape_engine.hpp"
 
-#include "drape_frontend/message_subclasses.hpp"
 #include "drape_frontend/gui/drape_gui.hpp"
+#include "drape_frontend/message_subclasses.hpp"
 #include "drape_frontend/my_position_controller.hpp"
 #include "drape_frontend/visual_params.hpp"
 
@@ -13,10 +13,16 @@
 
 #include <unordered_map>
 
-using namespace std::placeholders;
-
 namespace df
 {
+using namespace std::placeholders;
+
+namespace
+{
+std::string const kLocationStateMode = "LastLocationStateMode";
+std::string const kLastEnterBackground = "LastEnterBackground";
+}
+
 DrapeEngine::DrapeEngine(Params && params)
   : m_myPositionModeChanged(std::move(params.m_myPositionModeChanged))
   , m_viewport(std::move(params.m_viewport))
@@ -34,24 +40,20 @@ DrapeEngine::DrapeEngine(Params && params)
   m_threadCommutator = make_unique_dp<ThreadsCommutator>();
   m_requestedTiles = make_unique_dp<RequestedTiles>();
 
-  location::EMyPositionMode mode = params.m_initialMyPositionMode.first;
-  if (!params.m_initialMyPositionMode.second && !settings::Get(settings::kLocationStateMode, mode))
-  {
-    mode = location::PendingPosition;
-  }
-  else if (mode == location::FollowAndRotate)
+  using namespace location;
+  EMyPositionMode mode = PendingPosition;
+  if (settings::Get(kLocationStateMode, mode) && mode == FollowAndRotate)
   {
     // If the screen rect setting in follow and rotate mode is missing or invalid, it could cause
     // invalid animations, so the follow and rotate mode should be discarded.
     m2::AnyRectD rect;
     if (!(settings::Get("ScreenClipRect", rect) && df::GetWorldRect().IsRectInside(rect.GetGlobalRect())))
-      mode = location::Follow;
+      mode = Follow;
   }
 
   double timeInBackground = 0.0;
-  double lastEnterBackground = 0.0;
-  if (settings::Get("LastEnterBackground", lastEnterBackground))
-    timeInBackground = base::Timer::LocalTime() - lastEnterBackground;
+  if (settings::Get(kLastEnterBackground, timeInBackground))
+    timeInBackground = base::Timer::LocalTime() - timeInBackground;
 
   std::vector<PostprocessRenderer::Effect> effects;
 
@@ -448,11 +450,16 @@ void DrapeEngine::ModelViewChanged(ScreenBase const & screen)
 
 void DrapeEngine::MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive)
 {
-  settings::Set(settings::kLocationStateMode, mode);
-  if (m_myPositionModeChanged != nullptr)
+  settings::Set(kLocationStateMode, mode);
+  if (m_myPositionModeChanged)
     m_myPositionModeChanged(mode, routingActive);
 }
 
+location::EMyPositionMode DrapeEngine::GetMyPositionMode() const
+{
+  return m_frontend->GetMyPositionMode();
+}
+
 void DrapeEngine::TapEvent(TapInfo const & tapInfo)
 {
   if (m_tapEventInfoHandler != nullptr)
@@ -724,8 +731,9 @@ void DrapeEngine::SetKineticScrollEnabled(bool enabled)
                                   MessagePriority::Normal);
 }
 
-void DrapeEngine::OnEnterForeground(double backgroundTime)
+void DrapeEngine::OnEnterForeground()
 {
+  double const backgroundTime = base::Timer::LocalTime() - m_startBackgroundTime;
   m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
                                   make_unique_dp<OnEnterForegroundMessage>(backgroundTime),
                                   MessagePriority::High);
@@ -733,6 +741,9 @@ void DrapeEngine::OnEnterForeground(double backgroundTime)
 
 void DrapeEngine::OnEnterBackground()
 {
+  m_startBackgroundTime = base::Timer::LocalTime();
+  settings::Set(kLastEnterBackground, m_startBackgroundTime);
+
   m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
                                   make_unique_dp<OnEnterBackgroundMessage>(),
                                   MessagePriority::High);
diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp
index 7f1f3eaaec..b7b5b9019f 100644
--- a/drape_frontend/drape_engine.hpp
+++ b/drape_frontend/drape_engine.hpp
@@ -59,7 +59,6 @@ public:
            double vs,
            double fontsScaleFactor,
            gui::TWidgetsInitInfo && info,
-           std::pair<location::EMyPositionMode, bool> const & initialMyPositionMode,
            location::TMyPositionModeChanged && myPositionModeChanged,
            bool allow3dBuildings,
            bool trafficEnabled,
@@ -80,7 +79,6 @@ public:
       , m_vs(vs)
       , m_fontsScaleFactor(fontsScaleFactor)
       , m_info(std::move(info))
-      , m_initialMyPositionMode(initialMyPositionMode)
       , m_myPositionModeChanged(std::move(myPositionModeChanged))
       , m_allow3dBuildings(allow3dBuildings)
       , m_trafficEnabled(trafficEnabled)
@@ -207,7 +205,7 @@ public:
 
   void SetKineticScrollEnabled(bool enabled);
 
-  void OnEnterForeground(double backgroundTime);
+  void OnEnterForeground();
   void OnEnterBackground();
 
   using TRequestSymbolsSizeCallback = std::function<void(std::map<std::string, m2::PointF> &&)>;
@@ -250,6 +248,8 @@ public:
   void UpdateVisualScale(double vs, bool needStopRendering);
   void UpdateMyPositionRoutingOffset(bool useDefault, int offsetY);
 
+  location::EMyPositionMode GetMyPositionMode() const;
+
 private:
   void AddUserEvent(drape_ptr<UserEvent> && e);
   void PostUserEvent(drape_ptr<UserEvent> && e);
@@ -291,6 +291,8 @@ private:
 
   std::atomic<dp::DrapeID> m_drapeIdGenerator = 0;
 
+  double m_startBackgroundTime = 0;
+
   friend class DrapeApi;
 };
 }  // namespace df
diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp
index 1d61bce6ad..a84d763f1c 100755
--- a/drape_frontend/frontend_renderer.hpp
+++ b/drape_frontend/frontend_renderer.hpp
@@ -150,6 +150,8 @@ public:
 
   drape_ptr<ScenarioManager> const & GetScenarioManager() const;
 
+  location::EMyPositionMode GetMyPositionMode() const { return m_myPositionController->GetCurrentMode(); }
+
 protected:
   void AcceptMessage(ref_ptr<Message> message) override;
   std::unique_ptr<threads::IRoutine> CreateRoutine() override;
diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp
index ded3457614..695b393273 100644
--- a/drape_frontend/my_position_controller.cpp
+++ b/drape_frontend/my_position_controller.cpp
@@ -118,10 +118,6 @@ bool IsModeChangeViewport(location::EMyPositionMode mode)
 
 MyPositionController::MyPositionController(Params && params, ref_ptr<DrapeNotifier> notifier)
   : m_notifier(notifier)
-  , m_mode(params.m_isRoutingActive || df::IsModeChangeViewport(params.m_initMode)
-               ? location::PendingPosition
-               : location::NotFollowNoPosition)
-  , m_desiredInitMode(params.m_initMode)
   , m_modeChangeCallback(std::move(params.m_myPositionModeCallback))
   , m_hints(params.m_hints)
   , m_isInRouting(params.m_isRoutingActive)
@@ -153,22 +149,35 @@ MyPositionController::MyPositionController(Params && params, ref_ptr<DrapeNotifi
   , m_blockAutoZoomNotifyId(DrapeNotifier::kInvalidId)
   , m_updateLocationNotifyId(DrapeNotifier::kInvalidId)
 {
+  using namespace location;
+
   if (m_hints.m_isFirstLaunch)
   {
-    m_mode = location::NotFollowNoPosition;
-    m_desiredInitMode = location::Follow;
+    m_mode = PendingPosition;
+    m_desiredInitMode = Follow;
   }
   else if (m_hints.m_isLaunchByDeepLink)
   {
-    m_desiredInitMode = location::NotFollow;
+    m_mode = NotFollowNoPosition;
+    m_desiredInitMode = NotFollow;
   }
   else if (params.m_timeInBackground >= kMaxTimeInBackgroundSec)
   {
-    m_mode = location::PendingPosition;
-    m_desiredInitMode = location::Follow;
+    m_mode = PendingPosition;
+    m_desiredInitMode = Follow;
+  }
+  else
+  {
+    // Restore PendingPosition mode (and start location service on platform side accordingly)
+    // if we have routing mode or FollowXXX desired mode (usually loaded from settings).
+    m_desiredInitMode = params.m_initMode;
+    m_mode = (params.m_isRoutingActive || df::IsModeChangeViewport(m_desiredInitMode)) ?
+                PendingPosition : NotFollowNoPosition;
   }
 
-  if (m_modeChangeCallback != nullptr)
+  m_pendingStarted = (m_mode == PendingPosition);
+
+  if (m_modeChangeCallback)
     m_modeChangeCallback(m_mode, m_isInRouting);
 }
 
@@ -437,15 +446,22 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool
 
   if (!m_isPositionAssigned)
   {
-    // If the position was never assigned, the new mode will be desired one except the case when
-    // we touch the map during the pending of position. In this case the current mode must be
-    // NotFollowNoPosition, new mode will be NotFollow to prevent spontaneous map snapping.
+    // If the position was never assigned, the new mode will be the desired one except next cases:
     location::EMyPositionMode newMode = m_desiredInitMode;
     if (m_mode == location::NotFollowNoPosition)
     {
+      // We touch the map during the PendingPosition mode and current mode was converted into NotFollowNoPosition.
+      // New mode will be NotFollow to prevent spontaneous map snapping.
       ResetRoutingNotFollowTimer();
       newMode = location::NotFollow;
     }
+    else if (m_mode == location::PendingPosition && newMode < location::Follow)
+    {
+      // This is the first user location request (button touch) after controller's initialization
+      // with some previous not Follow state. New mode will be Follow to move on current position.
+      newMode = location::Follow;
+    }
+
     ChangeMode(newMode);
 
     if (!m_hints.m_isFirstLaunch || !AnimationSystem::Instance().AnimationExists(Animation::Object::MapPlane))
@@ -645,7 +661,7 @@ void MyPositionController::ChangeMode(location::EMyPositionMode newMode)
   }
 
   m_mode = newMode;
-  if (m_modeChangeCallback != nullptr)
+  if (m_modeChangeCallback)
     m_modeChangeCallback(m_mode, m_isInRouting);
 }
 
@@ -653,7 +669,7 @@ bool MyPositionController::IsWaitingForLocation() const
 {
   if (m_mode == location::NotFollowNoPosition)
     return false;
-  
+
   if (!m_isPositionAssigned)
     return true;
 
@@ -742,7 +758,7 @@ void MyPositionController::UpdateViewport(int zoomLevel)
 {
   if (IsWaitingForLocation())
     return;
-  
+
   if (m_mode == location::Follow)
   {
     ChangeModelView(m_position, zoomLevel);
@@ -759,7 +775,7 @@ m2::PointD MyPositionController::GetRotationPixelCenter() const
 {
   if (m_mode == location::Follow)
     return m_visiblePixelRect.Center();
-  
+
   if (m_mode == location::FollowAndRotate)
     return m_isInRouting ? GetRoutingRotationPixelCenter() : m_visiblePixelRect.Center();
 
diff --git a/drape_frontend/my_position_controller.hpp b/drape_frontend/my_position_controller.hpp
index d30c288592..81b62255a5 100644
--- a/drape_frontend/my_position_controller.hpp
+++ b/drape_frontend/my_position_controller.hpp
@@ -114,6 +114,7 @@ public:
   void StopLocationFollow();
   void NextMode(ScreenBase const & screen);
   void LoseLocation();
+  location::EMyPositionMode GetCurrentMode() const { return m_mode; }
 
   void OnEnterForeground(double backgroundTime);
   void OnEnterBackground();
@@ -191,7 +192,7 @@ private:
 
   base::Timer m_lastGPSBearingTimer;
   base::Timer m_pendingTimer;
-  bool m_pendingStarted = true;
+  bool m_pendingStarted;
   base::Timer m_routingNotFollowTimer;
   bool m_blockRoutingNotFollowTimer = false;
   base::Timer m_blockAutoZoomTimer;
diff --git a/iphone/Maps/Core/Location/MWMLocationHelpers.h b/iphone/Maps/Core/Location/MWMLocationHelpers.h
index ddeed6557e..abb31343bf 100644
--- a/iphone/Maps/Core/Location/MWMLocationHelpers.h
+++ b/iphone/Maps/Core/Location/MWMLocationHelpers.h
@@ -3,7 +3,6 @@
 #include "platform/localization.hpp"
 #include "platform/location.hpp"
 #include "platform/measurement_utils.hpp"
-#include "platform/settings.hpp"
 
 #include "geometry/mercator.hpp"
 
@@ -18,15 +17,6 @@ static inline NSString * formattedDistance(double const & meters) {
   return @(measurement_utils::FormatDistanceWithLocalization(meters, localizedUnits.m_high, localizedUnits.m_low).c_str());
 }
 
-static inline BOOL isMyPositionPendingOrNoPosition()
-{
-  location::EMyPositionMode mode;
-  if (!settings::Get(settings::kLocationStateMode, mode))
-    return true;
-  return mode == location::EMyPositionMode::PendingPosition ||
-         mode == location::EMyPositionMode::NotFollowNoPosition;
-}
-
 static inline ms::LatLon ToLatLon(m2::PointD const & p) { return mercator::ToLatLon(p); }
 
 static inline m2::PointD ToMercator(CLLocationCoordinate2D const & l)
@@ -46,4 +36,4 @@ static inline MWMMyPositionMode mwmMyPositionMode(location::EMyPositionMode mode
   case location::EMyPositionMode::FollowAndRotate: return MWMMyPositionModeFollowAndRotate;
   }
 }
-}  // namespace MWMLocationHelpers
+} // namespace location_helpers
diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm
index 87a5476db7..a3e9e4f694 100644
--- a/iphone/Maps/Core/Routing/MWMRouter.mm
+++ b/iphone/Maps/Core/Routing/MWMRouter.mm
@@ -279,20 +279,23 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
   auto const doStart = ^{
     auto &rm = GetFramework().GetRoutingManager();
     auto const routePoints = rm.GetRoutePoints();
-    if (routePoints.size() >= 2) {
+    if (routePoints.size() >= 2)
+    {
       auto p1 = [[MWMRoutePoint alloc] initWithRouteMarkData:routePoints.front()];
       auto p2 = [[MWMRoutePoint alloc] initWithRouteMarkData:routePoints.back()];
 
-      if (p1.isMyPosition && [MWMLocationManager lastLocation]) {
+      CLLocation *lastLocation = [MWMLocationManager lastLocation];
+      if (p1.isMyPosition && lastLocation)
+      {
         rm.FollowRoute();
         [[MWMMapViewControlsManager manager] onRouteStart];
         [MWMThemeManager setAutoUpdates:YES];
-      } else {
-        MWMAlertViewController *alertController = [MWMAlertViewController activeAlertController];
-        CLLocation *lastLocation = [MWMLocationManager lastLocation];
-        BOOL const needToRebuild =
-          lastLocation && !location_helpers::isMyPositionPendingOrNoPosition() && !p2.isMyPosition;
-        [alertController
+      }
+      else
+      {
+        BOOL const needToRebuild = lastLocation && [MWMLocationManager isStarted] && !p2.isMyPosition;
+
+        [[MWMAlertViewController activeAlertController]
           presentPoint2PointAlertWithOkBlock:^{
             [self buildFromPoint:[[MWMRoutePoint alloc] initWithLastLocationAndType:MWMRoutePointTypeStart
                                                                   intermediateIndex:0]
diff --git a/map/framework.cpp b/map/framework.cpp
index 12b2e434be..ac7411fcf1 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -104,7 +104,6 @@
 using namespace location;
 using namespace routing;
 using namespace storage;
-using namespace std::chrono;
 using namespace std::placeholders;
 using namespace std;
 
@@ -237,6 +236,11 @@ void Framework::SetMyPositionPendingTimeoutListener(df::DrapeEngine::UserPositio
   m_myPositionPendingTimeoutListener = move(fn);
 }
 
+EMyPositionMode Framework::GetMyPositionMode() const
+{
+  return m_drapeEngine ? m_drapeEngine->GetMyPositionMode() : PendingPosition;
+}
+
 TrafficManager & Framework::GetTrafficManager()
 {
   return m_trafficManager;
@@ -1141,10 +1145,7 @@ void Framework::MemoryWarning()
 
 void Framework::EnterBackground()
 {
-  m_startBackgroundTime = base::Timer::LocalTime();
-  settings::Set("LastEnterBackground", m_startBackgroundTime);
-
-  if (m_drapeEngine != nullptr)
+  if (m_drapeEngine)
     m_drapeEngine->OnEnterBackground();
 
   SaveViewport();
@@ -1161,12 +1162,8 @@ void Framework::EnterBackground()
 
 void Framework::EnterForeground()
 {
-  m_startForegroundTime = base::Timer::LocalTime();
-  if (m_drapeEngine != nullptr && m_startBackgroundTime != 0.0)
-  {
-    auto const secondsInBackground = m_startForegroundTime - m_startBackgroundTime;
-    m_drapeEngine->OnEnterForeground(secondsInBackground);
-  }
+  if (m_drapeEngine)
+    m_drapeEngine->OnEnterForeground();
 
   m_trafficManager.OnEnterForeground();
 }
@@ -1507,7 +1504,6 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFac
       df::MapDataProvider(move(idReadFn), move(featureReadFn),
                           move(isCountryLoadedByNameFn), move(updateCurrentCountryFn)),
       params.m_hints, params.m_visualScale, fontsScaleFactor, move(params.m_widgetsInitInfo),
-      make_pair(params.m_initialMyPositionState, params.m_hasMyPositionState),
       move(myPositionModeChangedFn), allow3dBuildings,
       trafficEnabled, isolinesEnabled,
       params.m_isChoosePositionMode, params.m_isChoosePositionMode, GetSelectedFeatureTriangles(),
@@ -1522,19 +1518,22 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFac
   });
   m_drapeEngine->SetTapEventInfoListener([this](df::TapInfo const & tapInfo)
   {
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, tapInfo]() {
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, tapInfo]()
+    {
       OnTapEvent(place_page::BuildInfo(tapInfo));
     });
   });
   m_drapeEngine->SetUserPositionListener([this](m2::PointD const & position, bool hasPosition)
   {
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, position, hasPosition](){
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, position, hasPosition]()
+    {
       OnUserPositionChanged(position, hasPosition);
     });
   });
   m_drapeEngine->SetUserPositionPendingTimeoutListener([this]()
   {
-    GetPlatform().RunTask(Platform::Thread::Gui, [this](){
+    GetPlatform().RunTask(Platform::Thread::Gui, [this]()
+    {
       if (m_myPositionPendingTimeoutListener)
         m_myPositionPendingTimeoutListener();
     });
@@ -3237,11 +3236,6 @@ bool Framework::HaveTransit(m2::PointD const & pt) const
   return handle.GetValue()->m_cont.IsExist(TRANSIT_FILE_TAG);
 }
 
-double Framework::GetLastBackgroundTime() const
-{
-  return m_startBackgroundTime;
-}
-
 void Framework::OnPowerFacilityChanged(power_management::Facility const facility, bool enabled)
 {
   if (facility == power_management::Facility::PerspectiveView ||
diff --git a/map/framework.hpp b/map/framework.hpp
index 9ea0ca7b0c..bad029ccc7 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -177,10 +177,6 @@ protected:
 
   drape_ptr<df::DrapeEngine> m_drapeEngine;
 
-  // Time in seconds.
-  double m_startForegroundTime = 0.0;
-  double m_startBackgroundTime = 0.0;
-
   StorageDownloadingPolicy m_storageDownloadingPolicy;
   storage::Storage m_storage;
   bool m_enabledDiffs;
@@ -400,6 +396,8 @@ public:
   void SetMyPositionModeListener(location::TMyPositionModeChanged && fn);
   void SetMyPositionPendingTimeoutListener(df::DrapeEngine::UserPositionPendingTimeoutHandler && fn);
 
+  location::EMyPositionMode GetMyPositionMode() const;
+
 private:
   void OnUserPositionChanged(m2::PointD const & position, bool hasPosition);
 
@@ -412,9 +410,6 @@ public:
     int m_surfaceHeight = 0;
     gui::TWidgetsInitInfo m_widgetsInitInfo;
 
-    bool m_hasMyPositionState = false;
-    location::EMyPositionMode m_initialMyPositionState = location::PendingPosition;
-
     bool m_isChoosePositionMode = false;
     df::Hints m_hints;
   };
@@ -741,7 +736,6 @@ private:
 public:
   // TipsApi::Delegate override.
   bool HaveTransit(m2::PointD const & pt) const;
-  double GetLastBackgroundTime() const;
 
   power_management::PowerManager & GetPowerManager() { return m_powerManager; }
 
diff --git a/platform/settings.cpp b/platform/settings.cpp
index aa8f91d187..2e09afc2f4 100644
--- a/platform/settings.cpp
+++ b/platform/settings.cpp
@@ -16,11 +16,10 @@
 #include <iostream>
 #include <sstream>
 
-using namespace std;
-
 namespace settings
 {
-char const * kLocationStateMode = "LastLocationStateMode";
+using namespace std;
+
 char const * kMeasurementUnits = "Units";
 
 StringStorage::StringStorage() : StringStorageBase(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME)) {}
@@ -367,6 +366,7 @@ bool IsFirstLaunchForDate(int date)
 }
 }  // namespace settings
 
+/*
 namespace marketing
 {
 Settings::Settings() : platform::StringStorageBase(GetPlatform().SettingsPathForFile(MARKETING_SETTINGS_FILE_NAME)) {}
@@ -378,3 +378,4 @@ Settings & Settings::Instance()
   return instance;
 }
 }  // namespace marketing
+*/
diff --git a/platform/settings.hpp b/platform/settings.hpp
index 2ff9a6c10a..4cfb6ae5c5 100644
--- a/platform/settings.hpp
+++ b/platform/settings.hpp
@@ -8,8 +8,6 @@
 
 namespace settings
 {
-/// Current location state mode. @See location::EMyPositionMode.
-extern char const * kLocationStateMode;
 /// Metric or Feet.
 extern char const * kMeasurementUnits;
 
@@ -57,8 +55,9 @@ inline void Clear() { StringStorage::Instance().Clear(); }
 /// Use this function for running some stuff once according to date.
 /// @param[in]  date  Current date in format yymmdd.
 bool IsFirstLaunchForDate(int date);
-}
+} // namespace settings
 
+/*
 namespace marketing
 {
 class Settings : public platform::StringStorageBase
@@ -82,3 +81,4 @@ private:
   Settings();
 };
 }  // namespace marketing
+*/