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

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