Fixes for #24690 - ensures pixels are set as the current ruler units