Merge "Avoid double-apply of dialog theme"