Merge "Increased toggling area" into qt-r1-dev
am: a854373bee

Change-Id: I628397789acf5a7b879a52f3d12cc9786d0869e2