Merge "Restore WATCH_APPOPS permission for systemui" into qt-dev