Removed FXL borders, no longer tries to call handleViewportResize if it does not exist
Merge remote-tracking branch 'origin/develop' into develop