Merge "Fix ViewGroup caching defaults" into mnc-dev