Previously we returned early if the new policy wanted no watermarks, but
we still need to iterate over page styles to remove the old watermarks
if there are ones.

Change-Id: Iebab2534e7c923e47c76562982a188a32b81ed26