Merge "Decrease the scope of mDialog"