added more constraints at setCurrentItem()
Merge branch 'develop'