WorkingWithDevice unified and forms

Initial update of iOS and Android.