Merge "Don't assume SYSTEM is current user on boot"