Merge "Wait a while before canceling the notification" into stage-aosp-rvc-ts-dev