Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1