Merge "Screen Resolution: add space for 4-digit values" into main