Merge "Fix back popping the back stack too much."