Merge "Fix issues related to saveLayer/restore deferral" into jb-mr2-dev