Merge "Fix the race between entitlement start/stop" into qt-r1-dev