Merge "Distinguish between editor back button presses and framework stopage" into mnc-dev