This is to track and reflect https://github.com/flutter/flutter/issues/21102 also https://github.com/flutter/flutter/issues/17950