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