Merge "Retain configuration change info and sync access." into jb-mr1.1-dev