Merge "Fix Language & Input Settings layouts padding - part 2"