Merge "Set a fixed layout size only if the container view has a WRAP_CONTENT layout mode." into klp-dev