Better solution to page curation / page patrolling conflict

Change-Id: I3caa7a5bba01a1e10a9db1514961b92996c3dc01
Merge "Better solution to page curation / page patrolling conflict"