Merge "Allow userdata_exp partitions" into main