am 4eb312fa: Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1

* commit '4eb312faf9d7850dee4a1f10a41b343a4c923c03':
  Fix NPE in NavigationBarBase.onAction