Rename caller of '_prepareToSave'

Was missed when the function was renamed.

Change-Id: Ib8d6010136bef5c42484e3fb080bae9321527a3d
QA: watchlist icon is no longer a link but a span

Also removed unused element for watch list

Change-Id: Id4dbfd83d7804089abd6fe38de7b34e3af96e355
Merge "Rename caller of '_prepareToSave'"
Merge "QA: watchlist icon is no longer a link but a span"