Merge "Uncache the shortcuts when Android system shuts down if the notification settings are not changed" into rvc-dev