Merge "Show reboot dialog when tunring off developer option"