Merge "Resume-on-Reboot: allow multiple users"