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

Change-Id: Id84f29437568eddad76024e0022c2bb7d9558a6a