Merge "Remembers previous location mode when location off"