Merge "Make FLAG_LAYOUT_NO_LIMITS compatible"