am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

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