Remove unnecessary logic after changing to manually close mode.
Merge remote-tracking branch 'origin/riversyang'
Merge remote-tracking branch 'origin/riversyang'
Merge remote-tracking branch 'origin/riversyang'
Merge remote-tracking branch 'origin/riversyang'