am 6ba2ec8f: am 74fe6ce7: Merge "Do not go through a layout if visibility is...
am 6ba2ec8f: am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev automerge: 2381825d
* commit '6ba2ec8f':
Do not go through a layout if visibility is GONE