I noticed that the same changes were made in different PRs (#110, #112, #115, #117, #118, #119), therefore to avoid a lot of merge conflicts, I think it would be better to merge this individually and remove this change from those PRs.
If this gets merged, we would be able to edit previous redesign PRs according to it.
#
[x] Run the unit tests with ./gradlew check to make sure you didn't break anything
[x] If you have multiple commits please combine them into one commit by squashing them.
Description
I noticed that the same changes were made in different PRs (#110, #112, #115, #117, #118, #119), therefore to avoid a lot of merge conflicts, I think it would be better to merge this individually and remove this change from those PRs.
If this gets merged, we would be able to edit previous redesign PRs according to it. #
[x] Run the unit tests with
./gradlew checkto make sure you didn't break anything[x] If you have multiple commits please combine them into one commit by squashing them.