Merge "Set ignore flag during deferred savelayer" into jb-mr2-dev