Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1