(bug 45484) Add 'Discard changes' button

Change-Id: I570d590c519f142c6a023a795ce9205a6f6738e0
Merge "(bug 45484) Add 'Discard changes' button"