Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev