Merge "Fix layout measuring for dialogs" into master-layoutlib-native