Merge "Update snapshot upon saveLayer deferral" into jb-mr2-dev