Merge "Set max num of slices allowed in panel view" into qt-dev