Merge "Fix a bug where we could lose a loader content change." into jb-mr2-dev