am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

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