Save and restore state of checkboxes

Change-Id: Ie72c7e301eec589577300e9270998a22ab5e8f65
Merge "Save and restore state of checkboxes" into cm-11.0