fragment stack fixes

Change-Id: Id2d068961f3dac110ad1cd01724080317600b89a