Merge "Add private themes for dialogs spawned from Settings theme" into lmp-dev