Merge "NdkMediaDrm: properly check null listeners" into qt-qpr1-dev