Merge "Revert switchBar if enable / disable subscription fails." into qt-dev