Resolved issue with checkbox layouts

Fixed bug #1242656
Cherry-picked from release-0.3

Change-Id: I26cb8d8b6d22a212940ed0af65d195319d8596ae