Merge between master and ChocoButterUI

Stabilizing broken features that arises from merge between master and ChocoButterUI-merge
- Broken features includes Infinite Canvas, Pan control and has to integrated it to work with state machine.