remove extra persitst and update unit test for pageListener
Merge branch 'master' into 2.1