Removed armor/main inventory toggle from remote inventory
Merge remote-tracking branch 'origin/17' into 17