Mac: Grid should use new api's for converting a point if available
Initial updates for new layout refactoring
iOS: Finish updating for new layout changes, and share more code from Mac platform
Merge remote-tracking branch 'picoe/develop' into dev2