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

Change-Id: I3a901d6992505f6a8b4c07fdbfe27f13d1598b0a