am 84ea20d0: Merge "Restore the ability to track native Surface changes Bug...
am 84ea20d0: Merge "Restore the ability to track native Surface changes Bug #8230990" into jb-mr2-dev
* commit '84ea20d0':
Restore the ability to track native Surface changes Bug #8230990