Merge commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2' * commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2': Generalize DELAY_STARRED_UPDATE location.
Merge commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2' * commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2': Generalize DELAY_STARRED_UPDATE location.