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

* commit '36e2d32dab47f9d46c0234202c2a799c43b67c9e':
  Make "Ask every time" actually work that way