Merge "Allow setting alarm to the same time as an earlier one"