am a4474ae0: Merge "Detect and repair invalid layouts in the navigation bar." into ics-mr1

* commit 'a4474ae02546d725686f9c08113c16a84aca912c':
  Detect and repair invalid layouts in the navigation bar.