Merge "Calculate max_stashed_blocks correctly for block OTA v3"