Merge "Ensure layout in getExtendedPadding calls" into lmp-dev