Merge "should_flash_in_userspace signature change" into main