Merge "Don't send HOME intent twice when booting from non-system user." into qt-qpr1-dev