Merge "Use mContext directly, and enforce via logging" into qt-qpr1-dev