Core/Misc: Do not use singleton when calling to static function ChooseDisplayId (and remove unused parameter)
Core/Account: Remove unused helper functions
Core/Misc: Define multiple functions const (+ code cleanup here and there)
Merge remote-tracking branch 'tc/master' into mmaps