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

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