Fixes for #24690 - ensures pixels are set as the current ruler units
Merge branch 'master' of ssh://github.com/shotgunsoftware/tk-multi-snapshot