Merge "Bundle correlated switch changes atomically." into jb-mr1-dev