Merge "[MasterClear] fix race in showing dialog" into mnc-dev