am 05ba2eca: am 24498d61: Merge "Distinguish between editor back button presses and framework stopage" into mnc-dev

* commit '05ba2eca39c84f55a04e213c25a7417bcb6ab8ec':
  Distinguish between editor back button presses and framework stopage