Merge changes I0b30c4b9,I6d46c7a0 into main

* changes:
  Formatting kotlin file
  Fix minimalism feature not responding to settings change