Merge "Don't notifyPageSwitchListener until page settles (issue 12069757)" into jb-ub-now-kermit