Merge "Remove injecting developer options into Settings itself" into main