Merge "Skip some duplicated tasks when booting from non-system user."