Merge "Added missing mGlobalLock in system server" into qt-dev