Merge with mainline to bring in the timer API changes.
Attach a file by drag & drop or click to upload
