Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev