am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit '7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
  Make "Ask every time" actually work that way