Merge "Fix back stack problems due to postponed transitions" into oc-dev am: ce50eb2d17
am: c091a649ad

Change-Id: If14705a262ea3ee35d626f7e3d2deb6ddc035682