Merge "Remove toggle for home screen rotation when OneGrid flag is on" into main