Merge "Stop creating userrc_early"