Merge "Remove fixed TODO (Settings)"