am 4c326c2d: am 940f6f0c: Merge "Fix a race condition when switching between...
am 4c326c2d: am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
* commit '4c326c2d':
Fix a race condition when switching between settings panels