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

* commit '1c30f159d7a5eb64c35b8a817e8153437cae32f2':
  The mysterious blank item was just a mis-used layout