Merge "qseecom: fix listener unregistration issue"