Merge "Fix text color of the add block number button." into main