Fix layout issue when pushing non-animated