Merge commit '63697af83b5479733f2d4398b4199b8e492f532b' into eclair-plus-aosp * commit '63697af83b5479733f2d4398b4199b8e492f532b': Generalize DELAY_STARRED_UPDATE location.
Merge commit '63697af83b5479733f2d4398b4199b8e492f532b' into eclair-plus-aosp * commit '63697af83b5479733f2d4398b4199b8e492f532b': Generalize DELAY_STARRED_UPDATE location.