Merge "Check mSetupComplete on initialization to avoid service being disabled." into qt-r1-dev
am: 74a0753481

Change-Id: I6dc1f0acc283927ea4603d1a7706cd82e07ddc0c