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

* commit 'b5b7c2c5bd3d072cbcfc882ce80aab76b184247f':