Revert "Merge pull request #17464 from mcav/v1.3-alarm-edit-scroll"

This reverts commit 106fdb8faff549ed8f34eb249d66eba41a435f9d, reversing
changes made to f1c58f9f3b5d538afdd71ad3c22106200bc7ece5.