Merge "Defensively reset the default state of layout elements." into jb-dev