Merge "Code style cleanups to notifyOnPageChange()"