remove unused import for dart:json
Merge branch 'master' into feature/input_controls_fix