Add unit tests and behavior to correctly handle concurrrent manual scale events