Merge "Check ServiceState when showing dialog" into rvc-qpr-dev