Merge "AImageReader: make sure ~AImageReader isn't called with FrameListener::mLock held." into qt-r1-dev