Merge "Don't assume SYSTEM is current user on boot" into qt-r1-dev am: 53496f6fb3
am: 7ffb433ccf

Change-Id: Ifc6790c57487ba16d9fc9b1a5aa82a307a629d14