am c97332cb: am 31cee479: Merge "Fix a runtime restart when cycling between 4...
am c97332cb: am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
* commit 'c97332cb':
Fix a runtime restart when cycling between 4 users