Merge "Don't assume SYSTEM is current user on boot" into qt-r1-dev