Keep undo bar around until there is user interaciton

Bug: 10678578
Bug: 10674009

Also removed the use of withEndAction() call because it was
introduced in API 16, whereas we need to be compatible with
API 14+

Change-Id: I785770ae9a083f88056e94fc5378daf8ebc6dc6e
2 files changed