[[ Bug 13746 ]] Ensure window mask is scaled appropriately for the stack scale & resolution scale
Merge remote-tracking branch 'ian/bugfix-13746' into bugfix-13746
[[ Bug 13746 ]] Remove header include causing build errors
[[ Bug 13267 ]] Ensure current time matches end time when reaching end of selection.
Merge branch 'bugfix-13267' into develop
Merge remote-tracking branch 'ian/bugfix-13746' into bugfix-13746
[[ Bug 13746 ]] Commit libgraphics additions & fixes
Merge remote-tracking branch 'ian/bugfix-13746' into bugfix-13746
Merge branch 'bugfix-13746' into develop
Merge branch 'develop' into bugfix-13267
[[ Bug 13267 ]] Make sure we use accurate seekToTime after pause in play selection mode.
Merge branch 'bugfix-13267' into develop
Merge remote-tracking branch 'upstream/develop' into merge_6.7-rc-4_7.0

Conflicts:
	engine/engine.xcodeproj/project.pbxproj
	engine/src/lnximage.cpp