Merge "Add Accelerator resource watcher; fix bug of the alarm dictionary"