Merge "HsumBootUserInitializer creates MainUser earlier"