Merge "Don't display layout bounds of GONE views" into mnc-dev