Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev