Merged upstream/master.
Notification timer temporarily disabled.
Merged close-tab-loop