Merge "Restore the ability to track native Surface changes Bug #8230990" into jb-mr2-dev