am 9dc211af: am a4474ae0: Merge "Detect and repair invalid layouts in the...
am 9dc211af: am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1
* commit '9dc211af':
Detect and repair invalid layouts in the navigation bar.