Merge "Fix back stack problems due to postponed transitions" into oc-dev