Merge "Move Enable16KbTest to device-tests" into main