am 626a1665: am b46f3f67: Merge "Defensively reset the default state of layout...
am 626a1665: am b46f3f67: Merge "Defensively reset the default state of layout elements." into jb-dev
* commit '626a1665':
Defensively reset the default state of layout elements.