Merge "Delay boot complete broadcast for main user on HSUM." into udc-dev