Resolved issue with checkbox layouts

Fixed bug #1242656

Change-Id: I62b0f49a82ecc8c38bbea4b054f8210510c5261c
Merge "Resolved issue with checkbox layouts" into release-0.3