fix current device state problem
Merge branch 'rc4' of github.com:WSO2Mobile/mdm into rc4