Merge "Add proguard rule to keep LayoutManager constructors" into mnc-ub-dev