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

Change-Id: I778957f291926806ede70fa9b3f39270f419714a