Merge "Make more system dialogs could receive CLOSE_SYSTEM_DIALOGS" into sc-dev