Merge "Check ServiceState when showing dialog"