Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev