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