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