Merge "Handle non DynamicLayout in Editable draw method."