Merge "Disable dynamic initial bounds for developer options in Beta 2" into main