Merge "Set a shorter timeout for logging a warn on slow IUserSwitchObservers." into qt-qpr1-dev am: 928add13d4

Change-Id: I170d8d5d312a4147a0b88165dc47d7544e30561c