Merge "Keep track of Calling UID for WifiLock acquisition" into qt-dev