Merge "[pm] a system config to let oems register uids" into main