Merge "Fix Handling of user switching for headless user 0 model." into qt-qpr1-dev am: f4fc3e2693
am: aba33916d7

Change-Id: Id87c1ddc3ce066efee6b1ac613c34c7fd8758450