pageview label fixed

Change-Id: I5fe80ece58aed370dc7aaa82ea7b49158fffba28
Merge branch 'master' into develop