Merge "Add option to make sign-in notification ongoing"