[WIP] [RFC] Metro TabItem/Control Patch #3

- Fixes #540
- Fixes #539