Merge "Revert "Use mContext directly"" into qt-qpr1-dev am: 1f129a115a
am: 88079b3398

Change-Id: I1ee2b2f8e3312c250a1199057574883003a2fc31