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

Change-Id: Ibf3308822d6d54f21f135cc8fe289eb5cf1ffa61