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

* commit '7fb1843d7dd54eb78b5d37bd4d5ecf4e8ee5c311':