Merge "Don't keep LayoutlibCallback reference." into mnc-dev