Factor out indentation to a separate function
MBS-7779: Fix indentation in the locale drop-down

Use the indentation function from the previous commit for indenting
sub-locales in the locale drop-down, instead of directly using the
HTML entity that will get escaped and be visible as "&#xa0".
Move a comment to a more appropriate place
Merge remote-tracking branch 'chirlu/mbs-7779' into beta

* chirlu/mbs-7779:
  Move a comment to a more appropriate place
  MBS-7779: Fix indentation in the locale drop-down
  Factor out indentation to a separate function