am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '83951615f564521d542da00d3bf60a372787aced':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]