Merge "Update alarm data on main thread" into main