Merge "init: Look for super partition only on a boot device" into main