Merge "Tests for fix back stack problems due to postponed transitions" into oc-dev am: a93343a5bb
am: 03e6c6d540

Change-Id: I7898f9d106c9711ef60bf5b09cb593c5a3363eff