Allowed admins to change contact email of device without changing the device ownership
Merge branch 'small_fixes'