[[ Bugfix 13006 ]] Make controller scrollbar slightly wider
[[ Bug 13295 ]] Modify image bitmap locking to use target image size instead of scale.
[[ Bug 13295 ]] Tidy up image bitmap locking and copying
Merge remote-tracking branch 'upstream/develop' into bugfix-13006

Conflicts:
	engine/src/player-platform.cpp
Merge remote-tracking branch 'panos/bugfix-13006' into bugfix-13006
Merge branch 'bugfix-13006' into develop
Merge remote-tracking branch 'ian/bugfix-13295' into bugfix-13295
[[ Bug 13295 ]] Added release note.
Merge branch 'bugfix-13295' into develop