Fix regression on auto-fade of success message

Change-Id: Iec62f0c5b57435cdfcfa228d5709ef838499a7da
Closes-bug: #1276275
Merge "Fix regression on auto-fade of success message"