Merge "Notification text change should not be interruptive during post time" into sc-v2-dev