Merge "Clear AppOpsController  when it stops listening" into qt-dev