am b1c730f2: am 7fb1843d: am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev

* commit 'b1c730f2b3e41cc7a6718db654b28ca8cc7fc86b':