am 5a21ca5b: am 811959f4: (-s ours) am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0

* commit '5a21ca5bb6cf634944d3c2cfdc432221c71827d4':
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.