Merge "Increased toggling area" into qt-r1-dev