am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev

* commit '74fe6ce72dcbc7af501022e7617528c30a0983bb':
  Do not go through a layout if visibility is GONE